auto merge of #408 : alexcrichton/cargo/fix-master, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 19 Aug 2014 18:54:07 +0000 (18:54 +0000)
committerbors <bors@rust-lang.org>
Tue, 19 Aug 2014 18:54:07 +0000 (18:54 +0000)

Trivial merge